Auto merge of #2769 - alexcrichton:no-oom-travis, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 5 Jun 2016 06:06:58 +0000 (23:06 -0700)
committerbors <bors@rust-lang.org>
Sun, 5 Jun 2016 06:06:58 +0000 (23:06 -0700)
commit099ad28104fe319f493dc42e0c694d468c65767d
treea52dc5dd53223848629f008ef6ed1e6114aa722c
parent7d79da08238e3d47e0bc4406155bdcc45ccb8c82
parent762d2c2fffdf5f22b8ae4779dcf7c4794ee521cc
Auto merge of #2769 - alexcrichton:no-oom-travis, r=alexcrichton

Pass -j1 on Travis

Looks like if we do things concurrently we hit the OOM killer, so let's not do
that!